merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Thu, 27 Sep 2007 18:22:16 +0000 (12:22 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 27 Sep 2007 18:22:16 +0000 (12:22 -0600)

Trivial merge